only show the child if we have one.

Mon Oct  6 14:18:47 2003  Jonathan Blandford  <jrb@redhat.com>

        * gtk/gtkexpander.c (gtk_expander_animation_timeout): only show
        the child if we have one.

        (gtk_expander_button_release): use
        gtk_widget_activate instead.

diff --git a/ChangeLog b/ChangeLog
index bf7d80e53889ceec52af530a0628426bfd4ff53d..2d194996729053b362b3c910b070241584ffe751 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Oct  6 14:18:47 2003  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkexpander.c (gtk_expander_animation_timeout): only show
+       the child if we have one.
+
+       (gtk_expander_button_release): use
+       gtk_widget_activate instead.
+
 Mon Oct  6 21:05:46 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktable.c (gtk_table_class_init): Start the blurb for 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bf7d80e53889ceec52af530a0628426bfd4ff53d..2d194996729053b362b3c910b070241584ffe751 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Mon Oct  6 14:18:47 2003  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkexpander.c (gtk_expander_animation_timeout): only show
+       the child if we have one.
+
+       (gtk_expander_button_release): use
+       gtk_widget_activate instead.
+
 Mon Oct  6 21:05:46 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktable.c (gtk_table_class_init): Start the blurb for 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bf7d80e53889ceec52af530a0628426bfd4ff53d..2d194996729053b362b3c910b070241584ffe751 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Mon Oct  6 14:18:47 2003  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkexpander.c (gtk_expander_animation_timeout): only show
+       the child if we have one.
+
+       (gtk_expander_button_release): use
+       gtk_widget_activate instead.
+
 Mon Oct  6 21:05:46 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktable.c (gtk_table_class_init): Start the blurb for 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bf7d80e53889ceec52af530a0628426bfd4ff53d..2d194996729053b362b3c910b070241584ffe751 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Mon Oct  6 14:18:47 2003  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkexpander.c (gtk_expander_animation_timeout): only show
+       the child if we have one.
+
+       (gtk_expander_button_release): use
+       gtk_widget_activate instead.
+
 Mon Oct  6 21:05:46 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktable.c (gtk_table_class_init): Start the blurb for 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bf7d80e53889ceec52af530a0628426bfd4ff53d..2d194996729053b362b3c910b070241584ffe751 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Mon Oct  6 14:18:47 2003  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkexpander.c (gtk_expander_animation_timeout): only show
+       the child if we have one.
+
+       (gtk_expander_button_release): use
+       gtk_widget_activate instead.
+
 Mon Oct  6 21:05:46 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktable.c (gtk_table_class_init): Start the blurb for 

diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index 1a086d2f24c2694e3499472068b4dd291f8457db..4f44baa68b1ffda25ec66b0858dc51f9b600c347 100644 (file)
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -801,7 +801,7 @@ gtk_expander_button_release (GtkWidget      *widget,
 
   if (event->button == 1 && expander->priv->button_down)
     {
-      gtk_expander_activate (expander);
+      gtk_widget_activate (widget);
       expander->priv->button_down = FALSE;
       return TRUE;
     }
@@ -1163,7 +1163,8 @@ gtk_expander_animation_timeout (GtkExpander *expander)
   if (finish)
     {
       priv->animation_timeout = 0;
-      gtk_widget_set_child_visible (GTK_BIN (expander)->child, priv->expanded);
+      if (GTK_BIN (expander)->child)
+       gtk_widget_set_child_visible (GTK_BIN (expander)->child, priv->expanded);
       gtk_widget_queue_resize (GTK_WIDGET (expander));
     }